Add test features, and remove SAPPHIRE from library