added tests-file and minor preparations for ui