Modified tests - now working