implementing changes requested by martin; adding selenium tests