refactor test methods
fix failure test