Added last tests. Next to do is merge. AH-108