Replaced "test  bool" by "test bool" to make counting simpler.
Moved several tests to TC files