tests updated with fixtures