Updated units tests to reach >= 80%