fix inconsistencies in some tests
simplified Facade code