updated for testing, creating test class