changed basis() to match new basis_id args behavior, fixed tests, organized tests