#126 all system tests now working