Removed the old individual test stuff
Commented the code a lot more