Optimise
Fix tests