Fixed tests so they run