Made methods non-static. Some addition to the test cases.