Improved Facade & integration test