All test cases pass now
Fixed last errors and buggs