Add nicer testing