[GP-76] added more tests and fixed some classes