Started re-org of tests
first test :)