Add some tests for wall-component and main and make them pass