Improved test cases, method names and documentation