small clean upa and some tests