Fixes
Fixed almost all tests
Tests fixed