updates
implemented testem-both