Move tests

[brummett]

Move the tests up to the same level as "manager" and add more tests. Since changing to use update() handlers it should be more testable