Small changes and todo's!

Went through all code affiliated with TC to see whats left to do before tomorrows demo.
There is still parameters to be tested and a couple of other things to fix,
all marked with the TODO parameter in Eclipse. Also removed part of tests
that were unnecessary.
Found bug, added as TODO