Test features

Revised more tests.