Added some hardcore tests