Moving some initial tests over, more to come.