Added lecture factories and tests