changed up some tests and interfaces