More changes and the beginnings of a test framework :)