continued work on feature #1
even more tests