Revert "Added a test() method and refactored."

This reverts commit 54dafe9d9aff822756a8c2f1ae7cb3f67cfbd0d5.