More code compliance. New tests.