More tests, changed method structure