Added make target for tests.
Added check for static field value before assignment.