Tidy test names
Factor .cpp .h separate and add library