Adding tests
Initial Cubic layout