swapping some functionality to angular angular & more tests