started to rewrite user unit tests to bemore semantic