Fixed unit tests for submission