Updated test cases (still haven't tested them though yet) Small update
on func,non func, still not finished. Trying to hit up the 4 page limit