Housekeeping
Updated tests