cleaning up
More cleaning up
new test in progress