Improve fishbans and add more tests!