trying to get tests working (still needs some work)