Added fixtures, and test abstractions