Added more tests

Increased coverage. Possible fix for PyPy