Added test unit for screens
Added tests to check when you add multiple identical screens
Removed a lot of debugging