More tests
progress: around 70%