finished test scaffolding
added pending tests that need work to pass
added integration tests to master