start to improve tests