Moved FacadeTest and other minor fixes