resolved minor naming/testing issues. removed tests that are being duplicated by javascript tests.