Rfes #6 Moved unit test