Fixed compilation problems with tests - now they're failing. Also moved
them to folders named same as source code.