fix failing tests, remove dependencies on commons-beanutils and commons-lang