Add two failing tests and one passing test; minor cleanup