Testing

merging the tests into dev