CFY-1000 modified some tests and fixed some... stuff