2nd End-to-End Test in progress (Refactoring needed)