Refactor tests - replace initialize with setUp