Removed failing tests. Will reimplement with better test framework