Namespace and move old tests to the right folders/classes
Merge remote-tracking branch 'origin/master'