Adding tests, removing specific methods, adding writing commands