More evauluation

Changed stuff in test