Added some tests. Fixed some classes from src