Add more testing, replace pass with NotImplementedError