1386194841/refactor tests