More tests passing, adding real-life scenario to test