enable tests and some minor modifications