Adjusted tests and upgraded derby