chore(clean): Cleans up and fixes tests