Closes #4. Reverted tests