Added Tests, fixed Tkinter usage