A few changes
Lots of changes to tests. New tests