test & data file for hw3
hw3-tests conflicts resolved
database data types updated