Added test for lists and locations, cleaned main