Add wrapper tests. Fix first wrapper class stub