more tabs and remove test stuff