Adding & fixing tests