More tests added and methods