Intermediate checkin, because I suck at all the things :smile:
Added own props test