Adding ps24225 acceptance/unit tests