adding test and such