testing
merged and tests
adding tests for real