Debugged according to Integration Tests

Signed-off-by: pris <priscilla.ngsc@gmail.com>
Merge branch 'master' of https://github.com/benchisa/CS3202.git