fixed test issue, made tests simpler, added default Main