Made tests test changed functionality