working on cleaning up naming and making function parsing static
new naming code works for simple tests
got tests working again