More testing
Adds more tests
Makes everything kind of work again
Cleans up FiSH.c