Fixed problem with tests