Modified tests - tested ok