Added verification
Fixed Grid
Added tests
Simplified placeholder-values for tests.