Changed map and set tests to regular test suites (fixes #72)