updated tests to fully reflect wireframes