More unit testing.. next async tests..