Added slight testing and test support