FIXED errors after first test run