address comments and enable tests