Converted over 0.4 specfic test