Fix tests. Angular tidy up.