Added all needed source directories and combined coverage reporting into test step