added some tests and changed the test setup.