Revert "Revert "initial tests""

This reverts commit c32ea1c73a54ef1d443398cdbdd03f7284a9384a.