Fixed the entire test and cleaned up in the facade.