Adds additional initial tests, passes over half