starting to get tests going
some renaming