Cleaned up certain test portions

Removed a lot of unnecessay references, out dated information, etc.