Removing cruft
Update tests