Moved tests to UT