Some problems with tests and since they don't work, deleted