Tests and angular

It's time to merge the branch into master!