Add and fix tests - all green now