last tests and fixes