Attempt at better testing