More tests

More tests completed and tested, improving feedback from methods.