Tweaked form for tests