Adding more test cases and fixing more formatting issues