Updated fee schedule implementation, added tests