Added more test cases and tweaked the numbers