Fixing tests to work with test discovery which means close #1