fixed tests and standalone startup
fixed tests, fixed namespace changes