Added final tests. Coverage is now at 96% and all test cases I can think of are covered.