Updated to search for course and use some assertions.