removing psycopg2 and six from the requirements file
making the api plan test more generic