Moves tests to match psr4 classes