Complete the base layout and add some test