A few more tests added and all passing