Finishing reworking unit tests