Refactored / Solved Handler Issues

Refactored the JUnit tests and removed a redundant auto-generated
handler while fixing issues with the main GUI handler itself.