turning on some tests and fixing others
removing collection id from constants