Fixed issues with tests
Fixed issues with funcitonal tests