Quick and dirty impl of rest of test code