added test setup and several more methods