#74 remake tests