Use column_stack as per @rkern's suggestion, refactor tests.