WIP - porting over tests for functions
WIP - visibility for includes