Removed notes on not tested, as I am currently adding RSpec for these cases