Finish tests and implementation of indicator methods
Make snapshot methods private, delete tests accordingly