Some cleanup

Some cleanup in course test