reorganize tests, fixes #21