updated setup script, added pytest package and minor changes