fix tests and update acceptance namespace