Updating tests so they will at least build
Updated formatting