Started to do some test cases