updated to using entry_points in setup, and some testing