Tests

Fixed test cases merging to master now!