Added a few more test cases and did some project restructuring