all tests working with new architecture