[TEST] Adding more tests and parameter checks