Finished testing optional classes