Create unit tests. remove ununsed classes