Continue unit test dev