Scrapped existing testing system & set it up better
Added testing based on supertest