Removed half-examples, added more tests