Ran test on 18 23 24 and 1- 15

Fixed errors so that all tests pass
Test for FEE

Fixed and passed