Adding functional-specific tests
Adding middleware functionality
Finished writing primary tests