Finish unit-tests