Bug fixes based on previous code changes
Lots more tests