More unit tests for future