working test
better tests
starting to cleanup