Refactored tests adding before each