UC20 Finished Unit Tests, Finalized UI, updated SQL Query