Finish tests, remove warnings