Added logic for checking a test
Fixed merge conflicts