Test + Logic/UI Separation

WrappedLokum destroy fix
LokumMatrixTest.java addition