updated test structure to match lib structure
updated Makefile to run both sets of tests