cleaning up some tests and start work on title