Combined functional tests with selenium tests and added httpunit dependency