Test: Added more tests