more tests added, closes #4