Fixed gbase tests