#18 Intermediate test updates
Close #18 : Good enough for now