More tests added, all green