Splitted tests
Improved errors and added more tests