More tests
Ported all tests