Changed tests accordingly