Working on more tests
Getting there...