Simplify solution dirs.; fix unit tests