improved tests
avoid name conflictions
disabled freebond-related functions