added a couple utility functions
rename test to util