Incorporated more tests