More tests added and passing