Tests

Merging tests into master