more unit tests. master dev stopped until dev merge