Removed bad wrappers
Added base tests