Added test method with spinner, moved around some stuff