Add more tests

Add more tests