added tests and refactored incorrect docstrings
Merge pull request #451 from niphlod/fix/tests

added tests and refactored incorrect docstrings