New Tests and some basic edits