Cleaned up conference class and added more conference tests.