More tests written