Unit test and QA finish