Refactor tests to be one-liners
Tests unit field