remove extra stuff, enable tests