server tests and minor edits
minor edit and dummy data removed