WIP: extending test