Refined UI
added main test suite