Polish
Clean up tests with some pytest marking
Something about a bug...