Removed some 'float' remnants from Service classes
Amila's last test changed to check for null