Finish tests and fix issues discover during tests :)